Move the import for XendError, and use a bare import, not a from...import.

This should silence the error message when the program is terminated during
startup.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 648c5968a7f725e2054a72fd1e135866d3aaab9c..10b70f14701b7347381ab6ba6a304cefa2fc6dbf 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -30,9 +30,14 @@ from getopt import getopt
 import socket
 import warnings
 warnings.filterwarnings('ignore', category=FutureWarning)
+
+import xen.xend.XendError
+
 from xen.xend import PrettyPrint
 from xen.xend import sxp
 from xen.xm.opts import *
+
+
 shorthelp = """Usage: xm <subcommand> [args]
     Control, list, and manipulate Xen guest instances
 
@@ -687,7 +692,6 @@ def main(argv=sys.argv):
     args = argv[2:]
     if cmd:
         try:
-            from xen.xend.XendClient import XendError
             rc = cmd(args)
             if rc:
                 usage()
@@ -698,7 +702,7 @@ def main(argv=sys.argv):
         except IOError:
             err("Most commands need root access.  Please try again as root")
             sys.exit(1)
-        except XendError, ex:
+        except xen.xend.XendError.XendError, ex:
             if len(args) > 0:
                 handle_xend_error(argv[1], args[0], ex)
             else:
@@ -719,6 +723,3 @@ def main(argv=sys.argv):
 
 if __name__ == "__main__":
     main()
-
-
-